From 053e6c4b386348834e35e5fefc921fadc0e64025 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sun, 19 Oct 2025 13:02:15 +0200 Subject: [PATCH] github: improve CI MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - Remove unneeded CMAKE_SYSTEM_PROCESSOR. - Add summary table with sizes (in bytes) for each arch/variant. - Upload generated binaries as artifacts. - Add OpenWrt formalities. Signed-off-by: Álvaro Fernández Rojas --- .github/workflows/ci.yml | 64 ++++++++++++++++++++----- .github/workflows/formal.yml | 12 +++++ .github/workflows/scripts/ci_helpers.sh | 26 ++++++++++ 3 files changed, 91 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/formal.yml create mode 100644 .github/workflows/scripts/ci_helpers.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24e721e..05839a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,15 @@ jobs: - arch: x86_64 gcc: /usr/bin/x86_64-linux-gnu-gcc packages: gcc-x86-64-linux-gnu - + outputs: + size-aarch64-without-libubox: ${{ steps.without_libubox.outputs.size_aarch64 }} + size-aarch64-with-libubox: ${{ steps.with_libubox.outputs.size_aarch64 }} + size-arm-without-libubox: ${{ steps.without_libubox.outputs.size_arm }} + size-arm-with-libubox: ${{ steps.with_libubox.outputs.size_arm }} + size-mips-without-libubox: ${{ steps.without_libubox.outputs.size_mips }} + size-mips-with-libubox: ${{ steps.with_libubox.outputs.size_mips }} + size-x86_64-without-libubox: ${{ steps.without_libubox.outputs.size_x86_64 }} + size-x86_64-with-libubox: ${{ steps.with_libubox.outputs.size_x86_64 }} steps: - name: Checkout odhcp6c uses: actions/checkout@v5 @@ -53,7 +61,6 @@ jobs: working-directory: depends/json-c run: | cmake \ - -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }} \ -DCMAKE_C_COMPILER=${{ matrix.gcc }} \ -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/build \ -DBUILD_SHARED_LIBS=OFF -DDISABLE_EXTRA_LIBS=ON \ @@ -65,7 +72,6 @@ jobs: working-directory: depends/libubox run: | cmake \ - -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }} \ -DCMAKE_C_COMPILER=${{ matrix.gcc }} \ -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/build \ -DBUILD_LUA=OFF -DBUILD_EXAMPLES=OFF \ @@ -73,22 +79,58 @@ jobs: make make install - - name: Build odhcp6c (w/o libubox) + - id: without_libubox + name: Build odhcp6c (w/o libubox) + env: + BUILD_DIR: build/odhcp6c-without-libubox run: | cmake \ - -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }} \ -DCMAKE_C_COMPILER=${{ matrix.gcc }} \ -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/build \ -D USE_LIBUBOX=OFF \ - -B build/odhcp6c-without-libubox - make -C build/odhcp6c-without-libubox + -B $BUILD_DIR + make -C $BUILD_DIR + echo "size_${{ matrix.arch }}=$( find $BUILD_DIR -type f -name odhcp6c -printf '%s' )" >> $GITHUB_OUTPUT - - name: Build odhcp6c (with libubox) + - id: with_libubox + name: Build odhcp6c (with libubox) + env: + BUILD_DIR: build/odhcp6c-with-libubox run: | cmake \ - -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.arch }} \ -DCMAKE_C_COMPILER=${{ matrix.gcc }} \ -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/build \ -DUSE_LIBUBOX=ON \ - -B build/odhcp6c-with-libubox - make -C build/odhcp6c-with-libubox + -B $BUILD_DIR + make -C $BUILD_DIR + echo "size_${{ matrix.arch }}=$( find $BUILD_DIR -type f -name odhcp6c -printf '%s' )" >> $GITHUB_OUTPUT + + - name: Upload binaries + uses: actions/upload-artifact@v4 + with: + name: odhcp6c-${{ matrix.arch }}-binaries + path: | + build/odhcp6c-*/odhcp6c + if-no-files-found: error + + summary: + name: Sizes + needs: [build] + runs-on: ubuntu-latest + steps: + - name: Sizes summary + env: + size_aarch64_without_libubox: ${{needs.build.outputs.size-aarch64-without-libubox}} + size_aarch64_with_libubox: ${{needs.build.outputs.size-aarch64-with-libubox}} + size_arm_without_libubox: ${{needs.build.outputs.size-arm-without-libubox}} + size_arm_with_libubox: ${{needs.build.outputs.size-arm-with-libubox}} + size_mips_without_libubox: ${{needs.build.outputs.size-mips-without-libubox}} + size_mips_with_libubox: ${{needs.build.outputs.size-mips-with-libubox}} + size_x86_64_without_libubox: ${{needs.build.outputs.size-x86_64-without-libubox}} + size_x86_64_with_libubox: ${{needs.build.outputs.size-x86_64-with-libubox}} + run: | + echo "### ${GITHUB_WORKFLOW} sizes :floppy_disk:" >> $GITHUB_STEP_SUMMARY + echo "| Variant | aarch64 | arm | mips | x86_64 |" >> $GITHUB_STEP_SUMMARY + echo "| :---: | :---: | :---: | :---: | :---: |" >> $GITHUB_STEP_SUMMARY + echo "| w/o libubox | ${size_aarch64_without_libubox} | ${size_arm_without_libubox} | ${size_mips_without_libubox} | ${size_x86_64_without_libubox} |" >> $GITHUB_STEP_SUMMARY + echo "| with libubox | ${size_aarch64_with_libubox} | ${size_arm_with_libubox} | ${size_mips_with_libubox} | ${size_x86_64_with_libubox} |" >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/formal.yml b/.github/workflows/formal.yml new file mode 100644 index 0000000..081129d --- /dev/null +++ b/.github/workflows/formal.yml @@ -0,0 +1,12 @@ +name: Test Formalities + +on: + pull_request: + +permissions: + contents: read + +jobs: + build: + name: Test Formalities + uses: openwrt/actions-shared-workflows/.github/workflows/formal.yml@main diff --git a/.github/workflows/scripts/ci_helpers.sh b/.github/workflows/scripts/ci_helpers.sh new file mode 100644 index 0000000..2f9daf8 --- /dev/null +++ b/.github/workflows/scripts/ci_helpers.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +color_out() { + printf "\e[0;$1m%s\e[0;0m\n" "$2" +} + +success() { + color_out 32 "$1" +} + +info() { + color_out 36 "$1" +} + +err() { + color_out 31 "$1" +} + +warn() { + color_out 33 "$1" +} + +err_die() { + err "$1" + exit 1 +} -- 2.30.2